Proposal for multiple encoding context updates

For #565