Fixed bug in org merge.
Merge branch 'test' into dev