Updated for 1.22 release