This is the test and solution for #2067
Please verify and pull