Merge pull request #2310 from jeromekelleher/local-multiple-merger

Merge pull request #2310 from jeromekelleher/local-multiple-merger #2269