Fixed bugs in org activation.
Merge branch 'test' into dev