Merge "Add flag for clock reactive variants" into main