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