merge latest hifi into nb