merge from NBT master