add back in support for the tf201
Merge remote-tracking branch 'upstream/jb-4.2' into jb-4.2