Resolve CLIMATE-624. Merge PR#193.
Resolve CLIMATE-624. Merge PR#193.

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