WP-4736 moved this commit to WP-4736-1