HH-29111 test passes (incomplete commit)