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

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