added for master branch and new scenarios.