Merge "Revert "Fix NoSuchOptError on identity config option lookup""