Merge branches 'version2' and 'temp2' into version2