Resolve CLIMATE-473. Merge PR #74.
Resolve CLIMATE-473. Merge PR #74.

riverma/climate,apache/climate,kwhitehall/climate,riverma/climate,lewismc/climate,apache/climate,Omkar20895/climate,Omkar20895/climate,MBoustani/climate,lewismc/climate,MBoustani/climate,pwcberry/climate,jarifibrahim/climate,MJJoyce/climate,MJJoyce/climate,Omkar20895/climate,huikyole/climate,agoodm/climate,huikyole/climate,riverma/climate,jarifibrahim/climate,riverma/climate,huikyole/climate,agoodm/climate,jarifibrahim/climate,lewismc/climate,apache/climate,kwhitehall/climate,MJJoyce/climate,jarifibrahim/climate,apache/climate,kwhitehall/climate,pwcberry/climate,MBoustani/climate,lewismc/climate,agoodm/climate,Omkar20895/climate,pwcberry/climate,MBoustani/climate,kwhitehall/climate,pwcberry/climate,huikyole/climate,MJJoyce/climate,MJJoyce/climate,huikyole/climate,Omkar20895/climate,apache/climate,lewismc/climate,riverma/climate,agoodm/climate,MBoustani/climate,agoodm/climate,jarifibrahim/climate,pwcberry/climate