These were accepted upstream, for 3.20