bad merge in D334, refs T696