Merge "6Ghz scanning optimization - RNR" into sc-dev