Initial bridge functionality
Merge upstream changes