Merge branch 'ra/prompt-eread-fix'