Merge "Enable custom clock feature"