Make sure multiple names clauses retain same order
Merge pull request #7966 from cro/develop

Make sure multiple names retain original order