Import the latest changes from ABS @ 188823
Prepare for TheSLinux