Backport some changes done from Time Tracking feature in EE.

See merge request !7604