Merge 2

Change-Id: Idf22b192d7dea1219db95668669ee4adb61848fb
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>