Merge branch 'nomadik' into devel-stable