V2 merge

Merge version-2 with actual sanger/development branch.