Fix build of tdr from merged build.