Wip/merge upstream 2.4.x

Review by @eed3si9n