Entity name does not have to be unique. But name and parent have to be unique together.
Merge remote-tracking branch 'origin/develop' into develop