Austin Blatt any idea when this will be merged? We have a Platypus related ticket dependant on this fix.