Admin Panel merge from @drofnas

Admin Panel merge from @drofnas, as the initial merge pull was to the `master` branch and not the `admin-panel`