The issue is solved, noob here: shall I mark "resolved + upstream" or a more generic "resolved + fixed"?