Merge "Release Custom Clocks"