Merged streamline exception handling branch into v1.60