merge recent 2.16 updates to master