Resolve CLIMATE-442. Merge PR #39.
Resolve CLIMATE-442. Merge PR #39.

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