Looks like Figma has introduced component branching - I wonder how that will look for your projects in future!