Merge pull request #6528 from saurabh6790/hotfix

[minor][fix] for condition maker