Merge remote-tracking branch 'remotes/origin/master' into develop
Updating for non-breaking time_of_day setter
Fixed for a max_retries of 0
Merge remote-tracking branch 'remotes/origin/develop'