Resolve CLIMATE-712. Merge PR #266.
Resolve CLIMATE-712. Merge PR #266.

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