4 5 x backport