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