patch #8350
patch #8351
patch #8352
patch #8388
release-3-1-4