Merge commit 'becc9148e3698eeaf6ea854dabf2808490cd8f62' * commit 'becc9148e3698eeaf6ea854dabf2808490cd8f62': Add debug functions.
Merge commit 'becc9148e3698eeaf6ea854dabf2808490cd8f62' * commit 'becc9148e3698eeaf6ea854dabf2808490cd8f62': Add debug functions.