REL-2121: NPE in TPE offset feature unload
Merge branch 'feature/REL-2121' into develop