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