Extra decoding test
Merge branch 'dev' into ms