if cloud mode is enabled then dev mode is false
Merge remote-tracking branch 'origin/master'