Branch for CodeGear (Borland) specific fixes

[SVN r39356]