Revert "Ver1.2"

This reverts commit f368ede99f65202352092db9fc6b4e78263c07b9.
Revert "Revert "Ver1.2""

This reverts commit 5ada5927e3f85b55d92fac3d605c81c47b3caa5f.
Merge remote-tracking branch 'origin/master'