BGPL-18671

BGPL-18671