MAMADVA-1310

MAMADVA-1310