Tdh merged 2

should not have PRed this but I need it for my workspace to build