Resolve CLIMATE-454. Merge PR #56.
Resolve CLIMATE-454. Merge PR #56.

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