Merge S-48999_configuration_validation into develop