Merge branch 'fix/adjust-prompt' into master