feat/CARB-2256/2425_validation_fix