Merge "Expand scope of try/catch" into ics-mr0