[TIMOB-11869] [TIMOB-11267] More work on the validate step.