Fixed bugin empty orgs
Merge branch 'test' into dev
Build.