Merge "Avoid CAS errors on double post to ApiOptions"