Added the AVRO-1124 patched code...