MINOR2-2270

MINOR2-2270