BGPL-18670

BGPL-18670