Backporting more for status messages...
Merge pull request #1043 from Fuzzysqurl/ledyba

Backporting more for status messages...