Clueboard hotswap support (#2376)