Signed-off-by: Bryan Beaudreault <bbeaudreault@apache.org> (cherry picked from commit d7f6861e8dfc06398455330e25bdac958d0dcb37)