Merge pull request #19984 from calavera/vendor_engine_api_master

Vendor engine-api with client context changes.