Syncing from 3.0 branch - 2.9.16