Update proposed by D161764