Sync with latest master options changes