Merge branch 'release/1.10.2'