final changes in vision before backing up system
Merge branches 'version3' and 'rty' into version3