Signed-off-by: Jason Lowe <jlowe@apache.org>
Signed-off-by: Chris Douglas <cdouglas@apache.org>
(cherry picked from commit d4cc50f6)
(cherry picked from commit dbd69cb2)