Cherry-picked commits for O2Physics

| Commit subject | Tags first seen / associated labels | | — | — |