Change-Id: Ia91b4262d9dad60492f9175e453c950473689a8a Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>