Do not allow uncoditional tablet updates.
Merge branch 'master' into no-minus-1