Merge "Fix infraworkload forwarder"