Apply vanilla 3.16.1 patches
Merge master (3.16.1) patches