Issue #1186552 Fixing a mistake in the logic of the new schema behavior-hook
Cleaning many coding standard issues