More changes-3.1.0

Change-Id: I9f1af9662df781dc2a89149f7229133f844e5f3b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>