BGPL-18108

BGPL-18108