Bringing MarionetteConnection in line with the current marionette state (FF33)