Merge branch 'features/kraken'
Removing dependency on kraken