Merge branch 'uri-for-invoice' into cc