Should add a comment that these can be deleted when core dep ≥ 1.519.