Merge "Support more `os` under Ravenwood." into main