Merge branch '6.3.x' into 'BS-9105_FixValidatorMigration'
Merge branch 'BS-9105_FixValidatorMigration' into '6.3.x'