MINOR2-2168

MINOR2-2168