Merge branch 'vbraun-shell'