Cumulative update

Commit at the end of day 5

Signed-off-by: Marcel Oomens <Marcel.Oomens@cromido.org>