2.3.1 updates

Incorporates changes for v2.3.1 from upstream bootstrap code.