Replace command prompts according to new rules
mentioned in merge request !359 (merged)
mentioned in commit 95b7c9a8
closed with merge request !359 (merged)