Merge pull request #737 from caskdata/feature/ngui-bs330

Feature/ngui bs330
Merge branch 'develop' into feature/ngui_features_refactor