Merge branch '14x' into develop

Change-Id: I63d23030deb2fb4677e80fb53bcf4cbbe64d0609
Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>