Post-merge fix-ups of low-pri feedback requests