Merge branch 'release'
fixed bug when calling viewservice
Merge branch 'master' into release