closes #2338
Merge branch 'release/1.18'