Backport of !1767 (merged).
Update did not break ABI, so I am backporting both updates SDK and extension.