Added raw attribute to recoding
Merge branch 'dev' into ms