MINOR2-2241

MINOR2-2241