Merge branch 'release/v1.9.5'