merge: integrate latest main into benchmark branch