Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev