fix crash
fix
fix
fix
new
fix
new
fix
Merge branch 'master' into patch1