MING-13669

MING-13669