Merge boomshine changes into main