MINOR2-2279

MINOR2-2279