Merge no-op merges

Get everything up to date with merges on stage.