Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev