manual update of all master commits up to ca86fa8