Merge "RefBase: better hints for debugging" into main