re-added DEV/standalone mode
Merge remote-tracking branch 'origin/master'