DIL-3373 (branch typo: story is actually DIL-3373)