WIP: Forwarded PR: cockpit-packages #53

Closed
autogits-devel wants to merge 2 commits from PR_cockpit-packages#4 into master