splitting them into two patches is a good idea. But this feature is really valuable to us. We'll use it soon. trust me.