CHIP-3482

CHIP-3482