Merge weather records functionality into master