added tpl changes from vanilla
0.0.16