ORG-993: done for nodetype and object