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