Answering the suggestion from Pekka, here comes the separated version for 2.4.x