Merge branch 'von_benny' into devel