Edit commands topic

Reuses: d57bc1ed2ea6c0608de5b4de07466f0c763d5b47