Merge changes 1094812, 1095206, 1095207, 1095208 and 1095493 from trunk to 1.5 branch. Fixes: AVRO-802, AVRO-799, AVRO-798, and AVRO-763.