Upmerge to Latest Marlin

I hope this is the last upmerge before including the feature in official
Marlin branch!!