MINOR2-2275

MINOR2-2275