Add feature b
Merge branch 'feature_b' into develop