Signed-off-by: Andor Molnar <andor@apache.org> Signed-off-by: Balazs Meszaros <meszibalu@apache.org> (cherry picked from commit dffc8e0fbefda603e3c0557bc2ceac600152675e)