Merge "Fix GVN to handle normal paths leading to catch entry."