Merge diffs from billing sample r4