Merge branch 'fixes' into v3.0.1-vip
minor fixes
Merge branch 'fixes' into v3.0.1-vip