Merge branch 'f-customer-vendor-rights'