final backport