Merge "Deprecate the ``deactivate_image`` configuration switch"