Added more informative text.
Merge hotfix-add-more-text into stable