@samsonasik already worked on these - maybe rebase instead?