Fix icon browser
Reset session name to default
Don't rely on default session name for test
Merge branch 'master' into imp_6_1