Checkout
wrowe
committed
on 19 Jul 18
Correct see also comment, backports r1836287