WL-3274 Pull onto 10.x