Fixes for Salvage minimode to go along with new isxeve version in the works
Merge remote-tracking branch 'origin/experimental' into experimental