issue #2580: merged v2.1.5 to master branch

merged v2.1.5 to master branch