backport 483