Merge 3.15 bugfixes for 3.16