Merge pull request #1749 from kodustech/fix/business-logic-validation