[Engine-devel] upgrade failing with latest master