patch to v1.5 to work with TB 24

this branch is only for patching, no new features goes here