issue #2580: Merged  v2.1.5 to master branch

issue #2580: Merged  v2.1.5 to master branch