Issue 6920: Pretty print for the Command Editor
Merge branch 'issue6920'