A1.upstream.merge

A1: This fixes several minor issues and adds initial support for different Bitmine products (CoinCraft Desk and Rig).