Merge "Add handling for preferCodeIntegrity"