Port changes from fox.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>