Merge "Remind clients to verify returned module info" into main