Signed-off-by: Nathan Hjelm <hjelmn@me.com> (cherry picked from commit 3e1dd362411f1da5564d3402f65e9b3b74f50759)