Merge branch 'interactive_markers' into hydro-devel