Merge "Always set change status for ChangeAttributes"