#135: Add some performance improve for tablets.
Merge master