Mergebeacon-templateintomain

This branch has no changes from main