Integrated updates, code cleanup after integration

Signed-off-by: Dominik Schadow <dominikschadow@googlemail.com>
Integrated updates

Signed-off-by: Dominik Schadow <dominikschadow@googlemail.com>