Merge "Ravenwood: sdk to test_current" into main