Merge "Improve the debug info from overlay lookup"