Apply #8166 to master so folks can build v2.3.2