If possible, please don't rebase on the new `master` while we're still doing the review, as it muddies the diff between patch set versions that GitLab creates. Once everything is ironed out, you can rebase on the latest `master` (or even let AJ do it directly if there are not conflicts).