Merge "Making a comment a bit more explicit" into oc-mr1-dev