[MCSR-518] MCSR-518