Merge "Reject smart selection if outside original selection." into oc-dev