add bstack feature
Merge remote-tracking branch 'origin/bstack' into current