Merging the develop changes into master Upstream-commit: a119f42ef86517dc79e0b3749acdb457a63dea6d Component: packaging