Resolve CLIMATE-538. Merge PR #118.
Resolve CLIMATE-538. Merge PR #118.

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