Merge 3.15 bugfix for 3.16