Dave's changes to support a BBC Mode using ?#BFFE=8

Change-Id: Ie7ba1a5df17442cf891828f0be7a9e74d0e0d8bf