Changes: added two 2.22 changes