merge: sync origin/dev into feat/omp-o6-20260913