SWC-1506: clear data before asynchronous load
Merge pull request #1037 from jay-hodgson/clear-entity-tree

SWC-1506: clear data before asynchronous load