Merge branch 'eliasp-spiegel'