Submitted in #1212