Merge "Fixed an issue where the shade would jump" into oc-dev