Merge branch 'develop'
it works and it looks like energy is ok ish.