edit quick fix
Merge branch 'quickfix' into develop