GM: initial push
Merge https://github.com/GMelo/marionette-scrap