Merge branch 'scrR8'