add testcase for ticket 1923
Merge remote-tracking branch 'origin/4.2' into 4.2