Change-Id: Ia20f0902a407c2d9d47c998b847e082466c6f496 Reviewed-by: Eike Ziller <eike.ziller@digia.com>