Merge "Reverse update accounts logic" into oc-dev