Finalized #941²