Merge "UCE OPTIONS APIs updated" into sc-dev