Merge branch 'develop' into spike/matrix_annot