Merge "Fix check for DisabledDataStatusCheck"