Branch for CodeGear (Borland) specific fixes
Merge from trunk
Merge from trunk