Merge "Move ravenwood annotations to module-utils (1/2)" into main