Move BC layer to make sure it is always loaded.
Merge pull request #958 from cmfcmf/bc-layer

Move BC layer to make sure it is always loaded.