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