Backport 6190