Merge "Fixed that pinned huns could become clipped" into oc-dev