last important parts of RT 3.8.11 -> 3.8.13 upgrade