Merge pull request #721 from microsoft/dev

fix: Merging the changes from dev to main

Author: Prajwal-Microsoft

infra/main.bicep

@@ -268,6 +268,7 @@ resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
   name: 'default'
   properties: {
     tags: {
+      ...resourceGroup().tags
       ...tags
       TemplateName: 'Client Advisor'
       Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'