Merge master in clockTopic