Simplified decoding messages. Addedd support for <policy-file-request/>.'
Merge branch 'simplify-decoding'