I also created a dedicated placeholder for CLI and GUI.
Closes #1062 (closed)
This will create a new commit in order to revert the existing changes.
