Added BP 1.7-devel
Merge branch 'bp' into develop