r3037 - maintenance->trunk sync of changesets 2025~2026