an implementation of new feature
Merge branch 'feature-dev-HBC-001' into dev