Allowed time zero to 'reset'. re #6978
Merge branch 'feature/6978_muon' into develop