Follow-up from the review of #2293 (which closes #2248). See PR thread.
Follow-up from the review of #2293 (which closes #2248). See PR thread.