Resolve CLIMATE-472. Merge PR #72.
Resolve CLIMATE-472. Merge PR #72.

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