Feature 7432 Merge branch 'Azure'