Work in progress
Merge branch 'master' into recent-items-rsm
Some more rsm stuff working. Not there yet though
Small change to recent items result