Merge "Don't allow stacks above pinned stack." into oc-dev