Merge "Change flag enabling and disabling to use annotations for clocks flag" into main