Merge branch 'devel' into devel_equiv