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