Merge branch 'ch/installrescue'