Merge azure codebase