[RMILD-505] RMILD-505