Merge pull request #12207 from JMAConsulting/access-3-contri