merge master branch with release7.0 #22

Closed zgemma-star closed 5 years ago