Merge pull request #1759 from kodustech/test/critical-bug-regression-tests