Merge branch 'master' into ST3
Another corner case fix for day change swap
Merge branch 'ST3'