Merge branch 'v1.5' into LTS with v1.5.0a changes.