Merged origin/release/1710 branch