Merge "Apply hirono@'s logic for disabling delete action"