Branched commit 1

Signed-off-by: Manuel Bachmann <manuel.bachmann@open.eurogiciel.org>

Change-Id: I4c37f8a91eacf47de81078e4a8c0d9e8f429a249