[nou skins] split into separate bb's.
[blue-hd] fix build warning.
Merge remote-tracking branch 'upstream/2.1' into 2.1