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