Merge "Update the UCE OPTIONS API"