MINOR2-2189

MINOR2-2189