MINOR2-2196

MINOR2-2196