Merge branch 'develop' into spike/javier_noseqhack