merge conflict fix nr 2
merge conflict fix nr 2

senthil10/scilifelab,SciLifeLab/scilifelab,kate-v-stepanova/scilifelab,senthil10/scilifelab,kate-v-stepanova/scilifelab,jun-wan/scilifelab,SciLifeLab/scilifelab,SciLifeLab/scilifelab,jun-wan/scilifelab,jun-wan/scilifelab,senthil10/scilifelab,kate-v-stepanova/scilifelab,jun-wan/scilifelab,kate-v-stepanova/scilifelab,senthil10/scilifelab,SciLifeLab/scilifelab