Merge branch 'master' into auto-722-force-delete-errors
Use modify_state instead of just obey_config_change