Merge branch 'rr/misc-fixes'