Merge branch '3gpp_issue_805_fix_2' into 'main'

Review comments addressed as mentioned in 3GPP issue 805

See merge request !492