Merge pull request #4515 from EmmanuelMess/emmanuelmess/fix/quote_text