Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'