pull patches back in from 2.20-2 build