Added support for new RainTPLv3 fixes