Merged with ui upstream
Added X-Include to Options response