changes according to pull request
Merge branch 'staging' into 819-adjust_entity_tree_rake_task