Merge branch 'configEntity' into packetRefactor