Merge remote branch 'bitshark/burx_support' into wip/burx_support