Merge "Fixed an issue in the contrast calculation" into oc-dev