Apply 2.2.0 changes