Syncing with 2.10.1 release