UBSBUD-1981 - done, +BackgroundDrawer removed
Merge branch 'master' of github.com:csomakk/ShinyHeaven