Merge "Revert^2 "Add toolbox_ramdisk"" into main