Merge branch 'NGECore2-master'