Post-review changes for the merge into gaia