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