Merge branch 'next2' into gdnext