Merge "Ravenwood: Support mockito" into main