Do not use bridge_ internals
Merge pull request #1108 from mauiaaron/develop

Do not use bridge_ internals
Merge remote-tracking branch 'origin/develop' into develop