Merge "Rather than change the text, just remove the waiting for entries row." into jb-dev