Other pull request

Signed-off-by: Frediano Ziglio <frediano.ziglio@citrix.com>