Merge branch 'rh/prompt-tests' into pu