continuation of prev commit - testcase for 14330. Sync from branch Will fail in HEAD due to other issues