Resolve CLIMATE-684. Merge PR #239.
Resolve CLIMATE-684. Merge PR #239.

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