Merge "Address HPackedSwitch issues raised after merge"