Based on the fact that we are going to go ahead with PF4 I will start a new pr for this one and have closed the one linked.