Added full forwarding support [MJ-706]

All tests pass.