Merge branch 'hotfix/ud-1.0r' into develop
improve fix micro instances
fix race