Merge branch 'multibind'