Merge pull request #1317 from thess/bridge-update