merge 1010
Merge latest @torndeco and cleanup
Remove double entry for salvage
Comment out diag_log
merge with @torndeco 1,023