Successfully merging this pull request may close these issues.