Merge branch 'main' into 3gpp_issue_1258_fix