Complete backport