[OEM-108] fixed to use Jamie's new method of extending the default scope with an or condition.
Merge branch 'master' into develop