SWITCHYARD-2127 - Change in createValidateCondition method