(cherry picked from commit 7d3a89ce8e07d9fd1c31b4bd2324b71dd10ecef5) Signed-off-by: Sean Busbey <busbey@apache.org>