Merge branch 'release/syncupstream'