Merge tag 'v1.4'