more refactoring
Merge branch 'master' into multiple-bridges