Merge pull request #1 from VitalPet/7.0

7.0 merge with master
Merge pull request #2 from VitalPet/master

Merge pull request #1 from VitalPet/7.0