Merge pull request #15899 from greenpeace-cee/fix-ambiguous-order-column