Merge "Add link to class with constants" into oc-dev