[#62] Add vocabulary condition to policy marker mapping
Merge branch 'version-1.04' into version-1.05
Merge branch 'version-1.05' into version-2.01