ID#222: fixed issue with missing support of expression tags as already corrected in master. No need to merge.