Merge branches 'version3' and 'temp2' into version3