closes #2534
fixes
Merge branch 'release/4.0.15'