merge mmascher-insulate-panda