BGPL-18674

BGPL-18674