case 3616 - After CR fixes.