[RMILD-527] RMILD-527