Merge "Trim leading src-dir from Ravenwood sources" into main