issue #2264 sync v2.1.4 from develop branch to master branch

sync v2.1.4 from develop branch to master branch