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