Merge "Specify 'active' status for deleting situations"