[PD] Canvas editor patch