changing script to use system user
Merge branch 'master' into stable