Fixed bug with condition replication
Merge branch 'hotfix-4.9.7'