Wip 2.1 2509 sender ∂π

backport from master