Merge "Updates for co-ex" into sc-dev