Squash commit created by Whaler.