Allowed time zero to 'reset'. re #6978
Merge remote-tracking branch 'origin/feature/6978_muon'