Signed-off-by: Erik Krogen <xkrogen@apache.org> (cherry picked from commit 6bd24448154fcd3ab9099d7783cc7f7f76c61e08)