Merge "UCE OPTIONS APIs updated"