**What this PR does**: **Which issue(s) this PR fixes**: Fixes onepanelio/core# **Special notes for your reviewer**: **Checklist** Please check if applies - [ ] I have added/updated relevant unit tests - [ ] I have added/updated relevant documentation Required - [ ] I accept to release these changes under the Apache 2.0 License