draft patch to add 842 support