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