[Engine-devel] upstream/downstream compat