New pull request after merging problems.

New pull.