Backported patch: fix merged sections
Backported patch: fix merged sections

alvieboy/xtc-base,alvieboy/xtc-base,alvieboy/xtc-base,alvieboy/xtc-base,alvieboy/xtc-base,alvieboy/xtc-base,alvieboy/xtc-base,alvieboy/xtc-base,alvieboy/xtc-base