Merge "Set user initiated change from strategy" into main