final changes before saving backup
Merge branches 'version3' and 'temp00' into version3