ID#219: fixed configuration file definition.
ID#222: fixed issue with missing support of expression tags as already corrected in master. No need to merge.
Merge remote-tracking branch 'origin/release-2.1' into release-2.1