Making sure decorators don’t bleed from command to command
Merge branch 'hotfix/remove-persistant-decorators'