WP-2379 Commit to get around patch issue during release rebase