3285 eventless contacts pbs

For Task #4558 we need the #3285 functionality in the PBS branch. This PR pulls those changes into this branch.