Merge with SciLifeLab fork