Merge "ART: Update DCE to work with try/catch"