Merge branch 'fc/mergetool-prompt'