fix 1.4.0
Merge branch 'v1.4.0'