Merge "Edit option service"