V7.1 Merge

Adding v7.1 code into master branch