4.1: More v6-Tablet changes