Merge branch 'for-1.3.0'