Sync sys with -current
QinQ alternate fix

This diff fix QinQ problem fully