Resolve CLIMATE-490. Merge PR #89.
Resolve CLIMATE-490. Merge PR #89.

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