Switch back and upgrade mainline Marionette as PR has been merged