Changes for azure based on adr 74

Merged Vineeth Guna [Microsoft] requested to merge changes_for_azure_based_on_adr_74 into master

Merge request reports