Merge changes from topic 'fix-public-bridge'