BGPL-18344

BGPL-18344