Update package 2 #22

Closed
muellerr wants to merge 78 commits from mueller/update-package-2 into development
Showing only changes of commit 043d47e5e4 - Show all commits