Package entity moved from lexx to fetch
Merge remote-tracking branch 'origin/dev' into dev