Forward port of #5113 #5721 #5609 #5638 to 72x

Forward port of #5113 #5721 #5609 #5638 to 72x

I will make the same for 73x in a couple of minutes.