master 05,develop 03,commit 08
 

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