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