Merge branch 'improve_unknown_exception' into perf_helper_lookup