Merge branch 'Release-0.7.1'