Missing docs from backport