Feature/owd 32264 refactor clock