Draft: Merging changes from goa-5g-ntn branch to develop branch
NTN functionality developed on goa-5g-ntn branch is being merged into mainline develop branch
NTN functionality developed on goa-5g-ntn branch is being merged into mainline develop branch