Eng 4697 to timestamp

Please review the ENG 4695 first as this commit contains changes of ENG4695.