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