Add missing namespace
Merge branch 'master' into add_entity_test