Merge branch 'v1.5' into v1.4