OPERATOR-21108

OPERATOR-21108