Merge "Upgrade: add missing steps for l2gw"