Add modifications from 2.2.0