Merge "[NS04.8] Address comments from NS04 and NS04.5" into sc-dev