Backport completed