Signed-off-by: Andrew Purtell <apurtell@apache.org> (cherry picked from commit 3cc5d19039904361f60c413f10f3cbca27a7ba96)