Back-ported 4169