Merge "Fixed an issue where groups could stay userlocked" into oc-dev