Merge "Skip cloud regions and fix macro"