Hi @dotancohen , thank you so much for contributing this patch! The solution is very solid. This ticket was discussed in the most recent Media meeting and we agreed that this should move forward into the next release. The only tweak we'd suggest is instead of setting the post_id value to 0 it should maybe be set to null. In the process of discussing this ticket, we identified another trac ticket that almost identically solves this the way that you approached it, but with the null value instead of 0. #43579
We are going to close this ticket in favor of #43579 as it already has the change to null but I will make sure you both get props as you both have provided an excellent contribution. Thanks so much! if you have any other input, please feel free to jump into #43579 where we will be moving it forward.