Merge branch 'release/3.10.5'