Merge remote-tracking branch 'origin/main' into 378-add-otr-test-cases