Marionette AMD
Merge branch 'workstation_clean' into prod