master 05,develop 04,commit 09
 

Change-Id: I8d96e54db714296491ccdbe9f049124256221d3d
Signed-off-by: Christian Siewert <siewert.christian@ymail.com>