Submitted a new PR in #1728