Merge "Use ReentrantReadWriteLock in the compat framework" into sc-dev