Prep for merge: apply commit 48c9fcb50f7eb551a3182b9533bc10215435b9e4 to branch radix4