Merge "Fix incorrect PROC/ENDP match"