Choco butter

Test pull from ChocoButter, and fix to crash on shutdown causing UI tests to fail