DE10772: Better fix for conditions problem.
(cherry picked from commit 83ebf204c522e6dcb620698574f7d37737d25a6c)
Merge branch 'master' into dev