Signed-off-by: Peter Somogyi <psomogyi@apache.org> (cherry picked from commit 373dc7788d66ba7f7c49d727373c521c639d613c)