Final release version 7
Merge branch 'fake-master' into fake-develop