Signed-off-by: Jonathan Eagles <jeagles@gmail.com> (cherry picked from commit ed302f1fed6d124d682486d24dae958946dba9be)