Fixes #4986, #4984 deprecates create_*_entity functions