Maybe fixed Viki startup problem
Merge branch 'master' into work092