All this should go already to 4.1.x/