master 05,develop 02,commit 07

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