Add debug snippets for 6.x