Merge "Update co-ex error logic" into sc-dev