Merge branch 'bp/bind'