consumption fix
consumption follow up
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live