Merge branch '14x' into develop

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