fixing bridge creation
Merge branch 'master' into HEAD