Merge "Reject inconsistent rollback/staged settings ASAP (1/n)"