Fix WAVE-399 with Diff r2
8 files changed