@Kijewski this part of this PR is not going to be mergerd soon. I will cherry-pcik the nice parts of it.