sync with unstable (port bugfix)

Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>