Resolve CLIMATE-619. Merge PR #187.
Resolve CLIMATE-619. Merge PR #187.

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