[Engine-devel] Rebasing a patch on an updated dependency