Merge branch 'feature/marionette-tweaks' into prototype