closes #2597
Merge branch 'release/1.38'