MASA-12165

MASA-12165