Merge "Allow resetting locked modifier state" into main