Merge stuff from ntb