cherry-picked commit 9810703, fix for browser and _es_option method