Merge "Fixed bug in update forwarding"