Merging WEATHER-4 back to master

Merging WEATHER-4 back to master