Merge branch 'main' into 137-sid-5-2-kbps-todos-in-qmetadata