Merge branch 'devel' into devel_fixreq