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