Merge branch 'debug' into stack