Merge "Fix the build. Exchange -> Exchange2" into jb-dev