Bug751 v1.1

Resubmitting rebased patches without the auto checksum update patch.