Merge "Near-RT RIC simulator updates"