Merge branch 'eef_smach' into hydro-devel [ci skip]