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