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