Merge branch 'main' into 831-long-selftest-omasa-and-osba-parts-are-missing