Enviroment restore tools

Merged Santiago Said requested to merge enviroment-restore-tools into master

Merge request reports