Merge branch 'development'
Merge branch 'development'
Display PWD notice only on live-session