Backport 1766 -> 1768