Revert Back to Working ROM, need to check if this is also related to new recovery
Merge branch 'master' of https://github.com/trivalent/dev