Merge-request: 369
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: I51d19c6bcb8c30128500af5d9f7c7afb3360a570