Merge 1btcxe specific changes from mbassan/1btcxe-cron