sprint 24 small updates
Merge branch 'bpn_remake' into develop