Revised 15151 regression to minimal test case