Merge pull request #5513 from mallezie/contact-select-file-16178