[TASK] backporting changes from van-tomas.de development