Merge/2.10.2 to 2.10.x

Review by @JamesIry