BGPL-18343

BGPL-18343