[20411] Clock functionality added