Manual fixup as auto SHA stamping got broke.
Merge remote-tracking branch 'origin/next' into next_ned14