catching up on missed auto-merged stuff from #3122
Merge pull request #3224 from apfeiffer1/ap-catchUp-3122

catching up on missed auto-merged stuff from #3122