issue-1336
Merge pull request #1338 from cpo/next

issue-1336