Merge branch 'Zlash65-defer-stop-date' into develop