Merge "Update custom clock string" into main