Merge pull request #7126 from tobiasd/20190510-fixadminpanel