Renovierung/Optimierung

Einmal auf den aktuellen Stand bringen...

assigned to @tleilax

closed with commit 580b2cd4

mentioned in commit bfb1f36d

mentioned in commit 2adf3eb2

mentioned in commit 76b2a4d6

mentioned in commit f98195e4