Migrate run-make/short-ice to rmake
#126036
+48
−47
Merged