[#71587328] Implementing timestamp changes