Merge branch 'release/1.20'