Mergetemplate-bridgeintomain

This branch has no changes from main