DONT MERGE - Added test for issue #3179