[MNG-5213] Verify time formatting
Merge remote-tracking branch 'upstream/master'