Branch for CodeGear (Borland) specific fixes