Merge "Relocate tpl buffer allocation"