Merge branch 'main' into 1460-basop-multi-pose-ring-buffer-declarations-should-be-moved