Wip 2.1 misc backports ∂π

2915, 2916, 2928