DE10772: Better fix for conditions problem.
Merge branch 'master' into dev