capture work from old source tree towards 3.0.4-3, including an updated