Merges @cssquirrel CustomerAddress fixes