Merge "Never disable the manual rule (and fix it on read if it was disabled)" into main