Fixed an issue with the decoding dance
Merge branch '0.9-maintenance'