Merge remote-tracking branch 'origin/main' into 3gpp_issue_1931_fix