Merge "RAN Slicing Bug Fixes - Jakarta Release" into jakarta