fix in startup init file
Merge branch 'master' into edge