Merging changes from 'master' branch into 'cpp' branch

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