Manually merge fix for KCINFR-1008 Data dictionary validations ignored