Merge branch 'working_master'
Merge branch 'master' into working_master
fixed crash on redo -> type