Merge branch 'v1.4' into v1.5