Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> (cherry picked from commit 0bf0ba44de0cde5e041c188b409513866b7f5ab2)
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> (cherry picked from commit 5f7204c3bbc070fce2f3351419a64362fe15a8c6)