Merge branch 'version_1_3_0'