Merge "Fix L2GW jobs"