Merge remote-tracking branch 'new/develop' into feature/add_bug
Merge branch 'feature/add_bug' into develop