modified DSL version
Merge branch 'master' into CFY-1311-get-property-recursive-fix