Migration to marionette-2