support zoomed case
Merge branch 'inc-r12y'