Merge "Move section ID fallbacks into headers themselves"