Add testcase to try to reproduce #2144
Merge remote-tracking branch: upstream/master