TCI - Improve Next target Change-Id: I17d2e16bb96d02835d5fcebfb6ec43f6b39b5850 Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>