Merge "Add support for image deactivate and reactivate"