Synced with 2.2.0

See master branch for changelog