Merge branch 'ot/mru-on-list'