Redcarpet updates
Merge branch 'hotfix/redcarpetfix'