Boost branch rebased3