Merge commit 'lsnes-rr1'