[MADV-525] MADV-525