Date fix
Merge remote-tracking branch 'origin/temp-fixes'