Merge changes from branch 'cpp' into 'master'

Change-Id: Iaf89100775de0fb2a0d8eff4e3c854be2509a85e
Signed-off-by: Thomas Psota <thomas.psota@iese.fraunhofer.de>