Merge "Add support for forwarding more special codes"