Merge "(bug 44921) API should properly handle OPTIONS"