Work in progress on #1060