Debuginfo

Continuing #5148