[FIX] product: redo forward port 2832d2d for fix 12eb157 lost with 43977de