Fixed clipping bug when zoom in
Merge remote-tracking branch 'origin/11_fix_clipping_bug' into next