Second trial to include the BCID for Full scan mode.

Since it is very hard to manage these references, I am trying, a second time here. Hope I was fast enough..