Merge branch 'next2' into gdnext
gundam: Adapted new EntityRegister.h for inclusion