dev-454: wording change in command line prompt
Merge branch 'dev' into mem