1.2.5-backport