Merge branch 'rwsem-optimizations'