Merge branch 'nomadik' into devel