Manual merge pull request 386