2.2 prepatch update