Improved system status
Merge pull request #6573 from SiR-DanieL/system_-status

Improved system status