Task-number: 7238
Task-number: 7239

Change-Id: Ia0c5d13be2bd2e0decf0644882b0eb80054609bf
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>