Branch for CodeGear (Borland) specific fixes
Copied from trunk as it is missing from release
Copied by mistake