Changes from 244 build and backports from official Muppets repo