Matthias changes
Merged changes