add feature B
Merge remote-tracking branch 'origin/featureBBB' into featureB