10 backports

Backports of: SI-6595, SI-6584, SI-6426, SI-6072,
SI-5604, SI-5859, SI-5353, SI-5130, SI-4729, SI-2418