Refers to discussion in #757
Refers to discussion in #757