add target object class to facet context
4.1
Merge branch 'release/4.1' into develop