* Fix upstream merge * mixins: Fix checkstyle * client: Add back item tests * discord: builder default