Improvements to PR merge "add option show_real_foldernames"