Pull in upstream commits through released version 2.12.0