merge to recent fix8 code base