Replacement of #1731 with conflicts solved