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