Went to amaitland/tree/upgrade/1750 and acquired the code from that branch as of today, this check-in is only to 'rebase' this branch to 1750.  This is a large commit
merged in previous changes, but am overriding them with amaitland's branch