Could most of those not go into master as bugfix? I guess its already missing there, as well.