Initial work on #914