Merge branch 'Rudloff-unistra_hd'