MINOR2-2160

MINOR2-2160