Merge branch 'hotfix_assign_codingjob'
do not simplify terms in a span since space does not mean OR at top level in a span
Merge branch 'hotfix_or_in_span' into dev