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