Merge commit 'origin/data-encoding'