Re-commit for Fix 132 due to overwrite