WIP:rebase

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>