Merge branch 'release/v1.5'