BACKLOG-5244 Fix session loading & add resource bundle entries
Merge remote-tracking branch 'origin/master'