Merge branch 'hotfix-4.9.6'
Fixed bug with condition replication
Merge branch 'hotfix-4.9.7' into develop

Conflicts:
	app/models/condition.rb