Merge "Add UserOptionsUpdateJob class"