Merge branch 'next2' into gdnext
gundam: Adapt move of EntityRegister definition