Draft test for [1758a0b603].
merge 8.5