ADM-62937 Improve time formatting