JBDS-3092 remove stuff from the TP we might not need (experimental, do not merge PR) >> 4.40.x