Follow-up from 4d2f800677
4d2f800677
Closes #6172
... including the associated option. Fixes #2951 Closes #2952