Reviewed-by: Peter Szucs Signed-off-by: Chris Nauroth <cnauroth@apache.org> (cherry picked from commit ee7d1787cd2cdfea936425dcf88e750827ff5c1b)