Cherry pick

A collection of cherry-picking from Spuds and eurich