update rmt_storage and thermal-engine from N5