Fixing link error in standalone mode
Merge branch 'dev'